From 18afbf48afe11fa243b6ed1cdc4ec41b974cf8c6 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 7 Oct 2003 18:25:18 +0000 Subject: [PATCH] only show the child if we have one. Mon Oct 6 14:18:47 2003 Jonathan Blandford * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show the child if we have one. (gtk_expander_button_release): use gtk_widget_activate instead. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkexpander.c | 5 +++-- 6 files changed, 43 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf7d80e538..2d19499672 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Oct 6 14:18:47 2003 Jonathan Blandford + + * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show + the child if we have one. + + (gtk_expander_button_release): use + gtk_widget_activate instead. + Mon Oct 6 21:05:46 2003 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): Start the blurb for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bf7d80e538..2d19499672 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Mon Oct 6 14:18:47 2003 Jonathan Blandford + + * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show + the child if we have one. + + (gtk_expander_button_release): use + gtk_widget_activate instead. + Mon Oct 6 21:05:46 2003 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): Start the blurb for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bf7d80e538..2d19499672 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Mon Oct 6 14:18:47 2003 Jonathan Blandford + + * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show + the child if we have one. + + (gtk_expander_button_release): use + gtk_widget_activate instead. + Mon Oct 6 21:05:46 2003 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): Start the blurb for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bf7d80e538..2d19499672 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Mon Oct 6 14:18:47 2003 Jonathan Blandford + + * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show + the child if we have one. + + (gtk_expander_button_release): use + gtk_widget_activate instead. + Mon Oct 6 21:05:46 2003 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): Start the blurb for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bf7d80e538..2d19499672 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Mon Oct 6 14:18:47 2003 Jonathan Blandford + + * gtk/gtkexpander.c (gtk_expander_animation_timeout): only show + the child if we have one. + + (gtk_expander_button_release): use + gtk_widget_activate instead. + Mon Oct 6 21:05:46 2003 Matthias Clasen * gtk/gtktable.c (gtk_table_class_init): Start the blurb for diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 1a086d2f24..4f44baa68b 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -801,7 +801,7 @@ gtk_expander_button_release (GtkWidget *widget, if (event->button == 1 && expander->priv->button_down) { - gtk_expander_activate (expander); + gtk_widget_activate (widget); expander->priv->button_down = FALSE; return TRUE; } @@ -1163,7 +1163,8 @@ gtk_expander_animation_timeout (GtkExpander *expander) if (finish) { priv->animation_timeout = 0; - gtk_widget_set_child_visible (GTK_BIN (expander)->child, priv->expanded); + if (GTK_BIN (expander)->child) + gtk_widget_set_child_visible (GTK_BIN (expander)->child, priv->expanded); gtk_widget_queue_resize (GTK_WIDGET (expander)); } -- 2.30.2